merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 8 Sep 2010 03:55:57 +0000 (12:55 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 8 Sep 2010 03:55:57 +0000 (12:55 +0900)

Trivial merge